add functionality of QR code
no bundle yet
Merge branch 'master' of https://github.com/gtoshiba011/justAsk.git

Conflicts:
	project.properties