developcommited
Merge branch 'Develop' of https://github.com/KaranKathuria/NEMM.git into
Develop

Conflicts:
	bin/nemmcommons/CommonMethods.class
	bin/nemmcommons/NEMMContextBuilder.class