Merge branch 'master' into native-upload
Update README
Replace cURL upload with grunt-http-upload; Include .ico in template
0.4.0
Merge branch 'native-upload'