Modifying localstorage
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	js/router/AppRouter.js

View system refactoring