Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/src/sate2012/avatar/android/VideoPlayer.java
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git