Merge remote-tracking branch 'origin/master'

Conflicts:
	Footprints/App_Data/Footprints-20140516110236.mdf
	Footprints/App_Data/Footprints-20140516110236_log.ldf
change