Git test
pause and resume in view
Changed names in menu
ignores
Added Jar
Revert "Added Jar"

This reverts commit 3f67365f9d8e0888960b69f74d4be14cb9381b05.
Merge remote-tracking branch 'origin/development'

Conflicts:
	.gitignore
	src/com/spaceshooter/game/GameActivity.java
	src/com/spaceshooter/game/menu/MenuActivity.java
format
bugfix
Merge remote-tracking branch 'origin/development'

Conflicts:
	src/com/spaceshooter/game/view/GameView.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	src/com/spaceshooter/game/view/GameView.java
Update .gitignore
new laser sound
level bug fix
player name added
old database code removed
random commit
old database reference removed
Database merged with dev
Merge branch 'development' of https://github.com/DigohD/SE-Android into development

Conflicts:
	res/layout/menu_tab_view.xml