Initial commit
Merge commit '837261dfd40a1e82b4e931be555565ce51a350fc' into develop

* commit '837261dfd40a1e82b4e931be555565ce51a350fc':
  Initial commit

Conflicts:
	.gitignore