XML
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	bin/.gitignore
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git