get
Merge branch 'master' of github.com:Qtran-studio/qscreen

Conflicts:
	bin/AndroidManifest.xml.d
	bin/QScreen-debug-unaligned.apk
	bin/QScreen-debug-unaligned.apk.d
	bin/QScreen-debug.apk
	bin/QScreen.ap_
	bin/QScreen.ap_.d
	bin/build.prop
	bin/classes.dex.d
	gen/R.java.d
Merge branch 'master' of github.com:Qtran-studio/qscreen

Conflicts:
	bin/QScreen-debug-unaligned.apk
	bin/QScreen-debug.apk
	bin/QScreen.ap_
	bin/build.prop
	bin/classes.dex
	bin/classes/com/bizquit/qscreen/GestureDetector.class
	bin/classes/com/bizquit/qscreen/Sticker.class
Merge branch 'master' of github.com:Qtran-studio/qscreen

Conflicts:
	bin/QScreen-debug-unaligned.apk
	bin/QScreen-debug.apk
	bin/build.prop
	bin/classes.dex
	bin/classes.dex.d
	bin/classes/com/bizquit/qscreen/Sticker.class
Merge branch 'master' of github.com:Qtran-studio/qscreen

Conflicts:
	bin/QScreen-debug-unaligned.apk
	bin/QScreen-debug.apk
	bin/QScreen.ap_
	bin/QScreen.ap_.d
	bin/build.prop
	bin/classes.dex
	bin/classes.dex.d
	bin/classes/com/bizquit/qscreen/GestureDetector.class
	bin/classes/com/bizquit/qscreen/MainActivity.class
	bin/classes/com/bizquit/qscreen/Sticker.class
	gen/R.java.d
	src/com/bizquit/qscreen/MainActivity.java
Merge branch 'master' of github.com:Qtran-studio/qscreen

Conflicts:
	src/.DS_Store
	src/com/.DS_Store
	src/com/bizquit/.DS_Store
added installed apps class