Merge
Merge branch 'master' of https://github.com/wladengine/OnlineAbit2013

Conflicts:
	App_GlobalResources/NewApplication.Designer.cs