RR: add form settings page after share settings
Merge branch 'master' into form-settings-71-72

Conflicts:
	src/clj/ona/viewer/urls.clj
RR: fix metadata update test
RR: add form title to setting page
Merge branch 'master' into form-settings-71-72
RR: populate settings form with  form metadata details
Merge pull request #110 from onaio/form-settings-71-72

Form settings
PLD: add subfolders for template html files
Merge pull request #113 from onaio/template-reorg

PLD: add subfolders for template html files
PLD: filter and sort dataset for table
PLD: abstract functions, closes #112
Merge pull request #114 from onaio/tables-112

Tables 112
Merge branch 'master' into project-page-103
RR: update user link
RR: project activity WIP