Auto-reload collections
remove commented merge
Merge branch 'master' of github.com:AEHO/fb-hackathon

Conflicts:
	extension/js/collections.js