gitignore update
Merge branch 'master' of https://github.com/OPENi-ict/api-framework

Conflicts:
	.gitignore
	OPENiapp/apiplatform.log