adding variable
Merge branch 'master' into master-dev

Conflicts:
	Application.cs