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

Conflicts:
	templates/navBar.html

Schedule modification
List change on author and keyword