Re-upload, file path fix.
Merge branch 'master' of github.com:justinmwarner/Picogram

Conflicts:
	com.picogram.awesomeness/.classpath
	com.picogram.awesomeness/res/values/com_crashlytics_export_strings.xml
	com.picogram.awesomeness/src/com/picogram/awesomeness/SettingsActivity.java