Merge pull request #5 from maiamcguinness/master

Adding the dev_env file back
Adding my current ui-routing changes
Merge branch 'feature/restructure' of https://github.com/maiamcguinness/Planet-Lab into feature/restructure
Merge branch 'feature/angular-ui-router'

Conflicts:
	frontend/app/app.html