added some formatting to room reservations, using timepicker plugin, seperated manage reservations page
oops, fixing merge
Merge branch 'master' of http://github.com/poofytoo/nextres

Conflicts:
	nrd/app.js