Renaming Project
Merge branch 'master' into master-rajitha

Conflicts:
	Application.cs