added information about the configuration file
rearranged some of the configuration properties
reformating
added port number
refactoring and clean up
Merge branch 'develop' into feature/mongodb

* develop:
  refactoring and clean up
  added port number
  reformating
  rearranged some of the configuration properties
  added information about the configuration file