update footer with correct copyright
Merge pull request #35 from fhanik/develop

update footer with correct copyright
remove dimensions for the logo image

Conflicts:

	login-server/src/main/webapp/WEB-INF/jsp/access_confirmation.jsp
	login-server/src/main/webapp/WEB-INF/jsp/approvals.jsp
	login-server/src/main/webapp/WEB-INF/jsp/error.jsp
	login-server/src/main/webapp/WEB-INF/jsp/home.jsp
	login-server/src/main/webapp/WEB-INF/jsp/login.jsp

Signed-off-by: Filip Hanik <fhanik@gopivotal.com>
Merge pull request #36 from fhanik/develop

remove dimensions for the logo image
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'releases/1.2.9' into develop
fix version for developer branch
Merge branch 'releases/1.2.9' into develop
Merge pull request #37 from fhanik/develop

Develop
Merge branch 'releases/1.2.9' into develop
add code conventions template
adjust saml-login to mimic login-server in UI. Fix PWS
Merge pull request #39 from fhanik/develop

Develop