Design changes
fixed merge conflict Merge branch 'master' of https://github.com/chcokr/apphack.git

Conflicts:
	package.appxmanifest