Renamed Enemy(Ship)Impl to SimpleEnemy(Ship)
Deleted SimpleEnemyShip
Added an interface for descriping an entity's team
Dropped the Builder thingy. Didn't make enough sense.
Added weapon to SimpleEnemy and have it shoot in its constructor.
Implemented the Teamable interface in player and enemy
Enemies can now shoot. Timer isn't working though...
Enemies can now shoot properly (2 metres ahead of itself).
The enemy gets the weapon's timer and uses the callback to fire at the proper position.
Added teamable source in projectile
Added collision code with regards to teams
Merged in team functionality
Merge branch 'development' into shootingEnemies

Conflicts:
	Bullet-Inferno/src/se/dat255/bulletinferno/MyGame.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/Projectile.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/ProjectileImpl.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/Weapon.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/enemy/DefaultEnemyShipImpl.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/enemy/EnemyShipImpl.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/enemy/SimpleEnemy.java
	Bullet-Inferno/src/se/dat255/bulletinferno/model/weapon/WeaponImpl.java
Fixed tests and timer.
Merge branch 'shootingEnemies' into development
Added timer with delta draft.
Merge branch 'development' into timerWithDelta
Added missing timeSinceLast parameter to onTimeout
Merge branch 'timerWithDelta' into development
LoadoutScreen can now change the ships weapon.
* Added a createGame method in GameScreen that takes a weaponData object and creates the ship accordingly.
* Added some debug output