Modify ActVC
Add Act && Play model
Merge branch 'act_model'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fingaro/src/com/AppMain.as
	Fingaro/src/com/mapachestudios/projects/games/fingaro/models/Vocabulary.as
modify powerup
Added Act model
Merge branch 'act_model'
Add ContentManager and modified ActVC && ActHolderVC
Merge branch 'act_model'

Conflicts:
	Fingaro/src/com/mapachestudios/projects/games/fingaro/assets/ActVC.as
	Fingaro/src/com/mapachestudios/projects/games/fingaro/config/AppConfig.as
	Fingaro/src/com/mapachestudios/projects/games/fingaro/managers/ActManager.as
	Fingaro/src/com/mapachestudios/projects/games/fingaro/test/managers/ActManagerTest.as
Solve merge conflicts
Modify AppConfig
Merge remote-tracking branch 'origin/master'