latest version
Merge branch 'master' of https://github.com/Aberkane/Netcentric

Conflicts:
	NC/app/app.iml