Updated SDK to commit 9f7317cba151a93d463705e9e1dd8ad9b53e0982
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/colors.xml
	res/values/strings.xml
Adding back in updated colors that we left out of merge (hopefully this will eliminate future conflicts with every merge)
Removing .orig files created for last merge
Merge branch 'master' of github.com:Photobucket/printio-android-sdk