new version
Merge branch 'dev' into HEAD

Conflicts:
	public/assets/css/default.css
	public/js/config/config.js
	public/js/controllers/add.js
	public/views/index.html