added possability for config file
two property-files are now used to store default properties and
application properties (saved after the application was invoked)
Merge remote-tracking branch 'origin/master'