inspinia css, js, bootstrap, login page
Merge remote-tracking branch 'origin/lester.com.firefly.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/resources/js/directives.js