Merge branch 'collisionEffect' of github.com:q41/apc

Conflicts:
	BallAndPaddle Base/src/bp/base/Effect.java
	BallAndPaddle Base/src/bp/base/Level.java
Merge branch 'collisionEffect' of github.com:q41/apc

Conflicts:
	BallAndPaddle Importer/src/org/alia4j/languages/bp/action/DeployCollisionEffectAction.java
	BallAndPaddle Importer/src/org/alia4j/languages/bp/importer/Importer.java
Merge branch 'master' of github.com:q41/apc

Conflicts:
	BallAndPaddle Base/src/bp/base/Effect.java
	BallAndPaddle Base/src/bp/base/Level.java