Added Constants
Merge branch 'master' into gh-pages
Changed constants
Changed constants
Merge branch 'master' into gh-pages

Conflicts:
	dist/app.min.js
Changed constants