init commit
Merge branch 'master' of github.com:hanekedesign/android-nextgen-odi

Conflicts:
	.gitignore