Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	Fantail/src/main/res/menu/main.xml
	Fantail/src/main/res/values/strings.xml
re-add
Merge branch 'master' of https://github.com/cdn/fantail
Add photographic icon sourced from http://www.sxc.hu/photo/432038

Merge remote-tracking branch 'upstream/master'

Conflicts:
	Fantail/src/main/java/com/aurynn/fantail/MainActivity.java
	Fantail/src/main/res/menu/main.xml
	README.md
Merge branch 'master' of https://github.com/cdn/fantail