some code
ok
ok
ok
ok
ok2
Merge branch 'master' of github.com:WarwickPARSE/parse-client

Conflicts:
	PARSE/CoreLoader.xaml.cs
	PARSE/Database/DatabaseEngine.cs