list re-refactoring
Merge branch 'master' of https://github.com/novoda/gridrop

Conflicts:
	gridrop/app/AndroidManifest.xml
	gridrop/app/res/values/strings.xml
adding layout id