add file to commit
Merge branch 'master' of https://github.com/tracyyjy/CSSA_InfoPlatform

Conflicts:
	db/schema.rb

resolve conflict in db/schema version=>0 changed to version=>2013027055741