WIP

Conflicts:
	static/css/rmpme/style.css
first visual version ok
WIP
WIP
Merge branch 'master' into new_select_time
ready for review
changes after review by charles
Merge pull request #21 from habfast/new_select_time

New select time