Updates.
Merge branch 'master' of https://github.com/iandroutledge/Tylerfy

Conflicts:
	Tylerfy/App_Data/images.xml