Test
Merge branch 'master' of https://github.com/Akceptor/iJournal

Conflicts:
	WebContent/WEB-INF/web.xml
Revert