NOJIRA add javascript
NOJIRA add reg forms + controllers
NOJIRA add javascript
NOJIRA add various updates
Merge branch 'master' of github.com:collectiveaccess/pawtucket3

Conflicts:
	app/conf/assets.conf