Fixed nullpointer
Merge branch 'master' of https://github.com/NegatioN/WebApplicationF2014.git