some changes
Merge branch 'master' of github.com:silverdev/fiARworks

Conflicts:
	newapp/src/com/slsw/fiarworks/firework/GLRenderer.java
Merge branch 'master' of github.com:silverdev/fiARworks

Conflicts:
	newapp/src/com/slsw/fiarworks/firework/GLBackground.java