Fixed $q.all
add *.iml to .gitignore!
Merge branch 'master' into gh-pages