Entity Commit
Merge branch 'dev' of https://github.com/anthonyhombiat/wiss2014 into
dev