snapshot
Merge branch 'master' of github.com:alfredkam/PHYLO

Conflicts:
	assets/scripts/AppController.js