Adding project v1.0.
Fixing missing el
Merge branch 'bug-fix'

Conflicts:
	public/js/views/MainView.js