Summary
Merge branch 'master' of https://github.com/Heshitha/TeemaApplicationFinal

Conflicts:
	TeemaApplication/TeemaApplicationMain.Designer.cs
	TeemaApplication/TeemaApplicationMain.cs