Move to IntelliJ IDEA
Merge commit '657c3373f10239fcd1963aa7e62c57eba53bac81' into develop

Conflicts:
	app/app.iml
Cleanup