- Implemented collected drops
Merge branch 'master' of https://github.com/imranyousuf/drop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml

- Also, made Toq work
Merge branch 'master' of https://github.com/imranyousuf/drop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml

- Also, made Toq work
Merge branch 'master' of https://github.com/imranyousuf/drop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/drop/drop/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/imranyousuf/drop
Merge branch 'master' of https://github.com/imranyousuf/drop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/drop/drop/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml

-- Toq works now