New .idea
Merge branch 'develop' of github.com:iceraj/starx into develop

Conflicts:
	.gitmodules
	.idea
Removed submodule