sdf
Merge branch 'master' of https://github.com/webbakers/n-collab

Conflicts:
	src/themes/flat/assets/css/index.css
	src/themes/flat/assets/less/colors.less
	src/themes/flat/assets/less/icons.less
	src/themes/flat/assets/less/index.less
	src/themes/flat/assets/less/modules/login.less
	src/themes/flat/base.html
	src/themes/flat/login.html