Added regex to remove timestamp from .properties files
Merge branch 'master' of https://github.com/IHallik/-include--name-.git

Conflicts:
	POS/application.properties