minor
minor
minor
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore
	build/js/app.min.js