Merge pull request #15 from mbmihura/Refactor

Refactor
Fix syntax error on java6.
Merge pull request #16 from mbmihura/HotFix-java6UnrecognizeSintax

Fix syntax error on java6.
Merge branch 'DEV' of github.com:mbmihura/vestaro into SearchPage