fixed menu issues in merge
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared

Conflicts:
	src/com/NJSquared/state/BridgeGameState.as
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared