Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/charts/charts.html
#	dist/charts/d3_plain.html
#	dist/charts/easy_pie.html
#	dist/charts/flot.html
#	dist/charts/morris.html
#	dist/charts/rickshaw.html
#	dist/charts/sparkline.html
#	dist/components/ui_alerts.html
#	dist/components/ui_badge.html
#	dist/components/ui_buttons.html
#	dist/components/ui_card.html
#	dist/components/ui_carousel.html
#	dist/components/ui_icons.html
#	dist/components/ui_jumbotron.html
#	dist/components/ui_list_groups.html
#	dist/components/ui_modal.html
#	dist/components/ui_nav.html
#	dist/components/ui_navbar.html
#	dist/components/ui_notifications.html
#	dist/components/ui_popovers_tooltips.html
#	dist/components/ui_progress.html
#	dist/components/ui_tabs_accordion.html
#	dist/components/ui_toasts.html
#	dist/core/core_colors.html
#	dist/core/core_grid.html
#	dist/core/core_typography.html
#	dist/css/application-dark.min.css
#	dist/css/application.min.css
#	dist/css/maps/application-dark.min.css.map
#	dist/css/maps/application.min.css.map
#	dist/dashboard/index.html
#	dist/dashboard/visits.html
#	dist/dashboard/widgets.html
#	dist/demo/img/pictures/14.jpg
#	dist/demo/img/pictures/18.jpg
#	dist/demo/img/pictures/19.jpg
#	dist/demo/img/pictures/2.jpg
#	dist/demo/img/pictures/5.jpg
#	dist/demo/img/pictures/8.jpg
#	dist/e-commerce/product_detail.html
#	dist/e-commerce/product_grid.html
#	dist/extra/calendar.html
#	dist/extra/error.html
#	dist/extra/gallery.html
#	dist/extra/invoice.html
#	dist/extra/login.html
#	dist/extra/search.html
#	dist/extra/time_line.html
#	dist/form/form_elements.html
#	dist/form/form_validation.html
#	dist/form/form_wizard.html
#	dist/js/app.js
#	dist/js/charts/charts.js
#	dist/js/charts/d3-plain.js
#	dist/js/charts/easy-pie.js
#	dist/js/charts/flot.js
#	dist/js/charts/morris.js
#	dist/js/charts/rickshaw.js
#	dist/js/charts/sparkline.js
#	dist/js/dashboard/index.js
#	dist/js/dashboard/visits.js
#	dist/js/dashboard/widgets.js
#	dist/js/e-commerce/product-detail.js
#	dist/js/extra/calendar.js
#	dist/js/extra/gallery.js
#	dist/js/maps/gmap.js
#	dist/js/maps/maps-vector.js
#	dist/js/settings.js
#	dist/maps/maps_google.html
#	dist/maps/maps_vector.html
#	dist/other/chat.html
#	dist/other/compose.html
#	dist/other/email.html
#	dist/other/grid.html
#	dist/other/inbox.html
#	dist/other/package.html
#	dist/other/profile.html
#	dist/tables/tables_basic.html
#	dist/tables/tables_dynamic.html

Author: Blari

.gitignore

@@ -2,4 +2,6 @@
 .sass-cache/
 vendor/
 node_modules/
-bower_components/
+bower_components/
+
+/dist