Commit features test2
Merge origin/develop into develop

Conflicts:
	.gitignore
Merge master into develop
commit file2 on feature/file2
commit file3 on feature/file3