Merge branch 'db_in_memory' of https://github.com/mslosarz/zpi into db_in_memory

Conflicts:
	src/main/webapp/WEB-INF/layouts/default.jspx
Merge branch 'db_in_memory' of https://github.com/mslosarz/zpi into db_in_memory
images for styles