Changed to version 2 because of appengine error.
added icons to git
Merge branch 'dev'