Applying EhCache
Fixing minor buges, enabling port change with properties file
Versioning
Merge branch 'develop'