Fixed merge conflict + changes mentioned
Fixes
Update 13-android.html.md

Added Android docs about icons
Update 14-ios.html.md

Added link to iOS guidelines about icon sizes
Merge branch 'master' of https://github.com/AndreiRegiani/flixel-docs

Conflicts:
	documentation/03_resources/01-cheat-sheet.html.md