Merge branch 'master' of https://github.com/mhotan/Qin into targetrec

Conflicts:
	src/com/aqt/qin/LaunchActivity.java
Merge branch 'master' of https://github.com/mhotan/Qin

Conflicts:
	src/com/aqt/qin/LaunchActivity.java