fix ui-router missing in index.html
fix ui-router missing in index.html
Merge branch 'master' of https://github.com/TopEE/panis

Conflicts:
	src/main/webapp/index.html
	src/main/webapp/js/app.js
	src/main/webapp/js/registration/register-button.animation.js
	src/main/webapp/js/registration/register-form.animation.js
	src/main/webapp/js/registration/register.controller.js
	src/main/webapp/js/registration/registration.html
	src/main/webapp/js/registration/registration.js
Merge branch 'master' of https://github.com/TopEE/panis

Conflicts:
	src/main/webapp/index.html
	src/main/webapp/js/app.js
	src/main/webapp/js/registration/register-button.animation.js
	src/main/webapp/js/registration/register-form.animation.js
	src/main/webapp/js/registration/register.controller.js
	src/main/webapp/js/registration/registration.html
	src/main/webapp/js/registration/registration.js