fixed hours and updated angular-masonry
Merge branch 'master' of heroku.com:anchorotr

Conflicts:
	src/main/webapp/WEB-INF/resources/dev/js/home/home.tpl.html
	src/main/webapp/WEB-INF/resources/js/vender/angular-masonry.min.js
	src/main/webapp/WEB-INF/views/index.jsp