Handle subEvent navigation
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	index.html
	js/application/model/SWDFCommandStore.js
	js/application/router/AppRouter.js