htaccess modified
Merge branch 'prod' of https://github.com/ssachan/v2.git into prod

Conflicts:
	client/js/views/modalview.js