Renaming + Add some style
Merge branch 'master' into TP_SOLUTION

Conflicts:
	WebApp/Index.aspx
	WebApp/WebApp.csproj
Add some style + renaming