140714
Merge branch 'sanghyeon' into la_siesta

Conflicts:
	app/scripts/controllers/MainCtrl.js
	app/styles/main.css
	app/styles/main.scss
	app/views/main.html
	app/views/template/comment.html