FreeMarker templates
FreeMarker templates
FreeMarker templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/src/main/java/org/kofi/creditex/model/Application.java
	web/src/main/webapp/WEB-INF/templates/security_manager.ftl
	web/src/main/webapp/WEB-INF/templates/security_manager_credits.ftl