initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	simple_bugs/templates/simple_bugs/requirement_detail.html
merged changes