Science
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/tests/unit/controllersSpec.js
Topics are updated to use services and pass all unit tests
Merge pull request #44 from CombustibleLemons/devon-milestone-4B

User, Nav, and Topic Controllers fixed for new URLs