Merge branch 'master' of https://github.com/ThemeKit/BootstrapAdmin

# Conflicts:
#	dist/css/theme.css