Merge branch 'horiService'

Conflicts:
	.idea/hori.iml
	.idea/workspace.xml
	app/app.js
	app/home/contact.html
	app/home/contactCtrl.js
	app/home/detail.html
	app/home/detailCtrl.js
	app/home/home.html
	app/home/homeCtrl.js