Merge branch 'dev' of https://github.com/knagra/farnsworth into dev
Test multiple versions of django
Use django-1.7c1 instead of django-master
Merge branch 'master' into dev
Merge branch 'master' into django17
Added tests for make_workshift_pool_hours
Fixed a django17 warning
Test profiles a bit more
Added pypandoc to the list of required modules
Added more tests for utils
update
merged
ui update to buttons
update
Merge branch 'master' into dev

Conflicts:
	events/templates/view_event.html
Merge branch 'master' into django17
Added "count" to RegularWorkshift
Fixed various bugs
make_instances now respects shift.count
Updated tests
Added missing shifts
Make both start_time and end_time optional and independent of one other (Either can be set with the other off)
Added make_manager_workshifts
make_instances now takes a list of shifts, instead of one shift