Merge branch 'develop' of https://github.com/crediare/crediare.github.io
into develop

Conflicts:
	.project
.project