[NF] Save current work (#8).
Merge branch 'master' of https://github.com/avicentic/tap

Conflicts:
	tap01/src/main/java/rs/vicko/pages/UserSearch.java
	tap01/src/main/resources/rs/vicko/pages/UserSearch.tml