Tentatively moving everyone to sqlite3 gem #864
Merge branch 'master' into unstable

Conflicts:
	Gemfile
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge branch 'master' into unstable
Adding cancel link to new projects, as per #509
Adding cancel buttons to the remaining Administration->New X views...(#509)
Removing erroneous <p> tag added to roles controls.