replacements and generalizations for dates

Conflicts:
	src/com/futurice/festapp/service/FestAppService.java
Merge branch 'master', remote-tracking branch 'handle/master'
unified syntax in different files
Merge pull request #95 from robotti3/Issue86

replacements and generalizations for dates
Merge branch 'master' into issue52