Style waitlist
Merge branch 'master' of https://github.com/osmihi/Capstone

Conflicts:
	public/scripts/tables.js
	public/styles/styles.css
Merge branch 'master' of https://github.com/osmihi/Capstone