Conflict fix.
Merge branch 'master' of https://github.com/ivan-golub/ImagineCup

Conflicts:
	ImagineCupQuest/ICWindows8/Common/StandardStyles.xaml
Gitignore update.