#KAIKOMA-3 header footer split
KAIKOMA-3 user service add
Merge branch 'user_manage_angularjs' of https://github.com/kaikoma/intrasns into user_manage_angularjs

Conflicts:
	public/app/scripts/controllers/main.js
	public/app/views/news.html