initial
Merge remote-tracking branch 'origin/master' into branch1

Conflicts:
	weblayer/src/main/java/com/sitronics/learning/pfp/servicelayer/converters/PFPDateFormatter.java
	weblayer/src/main/java/com/sitronics/learning/pfp/servicelayer/converters/PFPDateStringConverter.java
	weblayer/src/main/java/com/sitronics/learning/pfp/weblayer/TestController.java
	weblayer/src/main/resources/settings.properties
	weblayer/src/main/webapp/WEB-INF/pfp-servlet.xml
	weblayer/src/main/webapp/WEB-INF/properties/settings.properties
	weblayer/src/main/webapp/WEB-INF/settings.properties
initial
update