re added flinch
added running away
Reset focus on map after battle; New BattleView not created on each
instance
Merge remote-tracking branch 'Cody/master'
fixed setting inital pokemon in a battle
commit before merge with joey
Merge remote-tracking branch 'Joey/master'
commit
Merge remote-tracking branch 'cfeltch537/master' into working

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/EffectDataBase.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/EffectType.java