** Removed log4j.properties because it messed up wildfly logging
Merge branch 'develop' of https://github.com/otavanopisto/pyramus into develop
Merge branch 'develop' of https://github.com/otavanopisto/pyramus into develop
** Added .tern-project into .gitignore