first angular commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	simple_bugs/models.py
first angular commit