KAIKOMA-3 not use script delete
refs #KAIKOMA-3 header footer split
#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
get current user test add
KAIKOMA-3 route resolve add
KAIKOMA-3 user list add
KAIKOMA-3 user list route change
KAIKOMA-3 user update delete add
KAIKOMA-3 user attribute change
KAIKOMA-3 user attribute change
KAIKOMA-3 user service spec add
KAIKOMA-3 user service spec add
KAIKOMA-3 user list sort
KAIKOMA-3 user filter add
KAIKOMA-3 server.js return user list change
aaa