added resolve
Merge branch 'master' of github.com:eucuepo/AngularKii

Conflicts:
	app/scripts/app.js
add security
Merge branch 'master' of github.com:eucuepo/AngularKii

Conflicts:
	app/scripts/app.js
	app/views/header.html