Not sure what this is for but I need to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Design/Mockup/html demo/admin_home.html