added jqueryui gem
modified:   Gemfile
modified:   app/assets/javascripts/application.js

Timepicker addon
new file:   app/assets/javascripts/jquery-ui-timepicker-addon.js
modified:   app/assets/stylesheets/application.css

Format forms
modified:   app/assets/stylesheets/main.scss
modified:   app/controllers/activities_controller.rb
modified:   app/views/activities/_activities_sorted_list.html.erb
modified:   app/views/activities/_activity_link.html.erb
modified:   app/views/activities/_how_much_search.html.erb
modified:   app/views/activities/_search_form.html.erb
modified:   app/views/activities/_sentence_search.html.erb
modified:   app/views/activities/_what_search.html.erb
modified:   app/views/activities/_when_search.html.erb
modified:   app/views/activities/_where_search.html.erb
modified:   app/views/activities/index.html.erb
modified:   app/views/activities/results.html.erb
modified:   app/views/activities/show.html.erb
Merge branch 'master' of https://github.com/thomasstephane/randompractice

Conflicts:
	app/controllers/activities_controller.rb