merge branch dev into branch my-project
Merge branch 'dev' into my-project

Conflicts:
	js/views/index.js
	js/views/project-detail.js
Merge pull request #22 from ingin/my-project

merge branch dev into branch my-project