must commit swf too??!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	FloorPlanner.swf
Revert "must commit swf too??!!"

This reverts commit b7faaec2d065f927f1ae66d1219adfdfe91e4e80.