added 'messages_extends' for adding persistent alerts. lifestudies.views.DisciplineCreateView now can add messages to the trainee which it assigns to.
changed the files a little bit. discipline_list.html and discipline_report.html now iterates through user.trainee.discipline_set.all instead of disciplines
fixed Discipline.__unicode__
uninstalled django-messages-extends
added messages for lifestudies app.
use relative imports. Changed dashes into underscore for template names.
fixed some naming issues to that of the practices in 2scoops
added namespacing to lifestudies
Merge remote-tracking branch 'origin/dev' into lifestudy-message

Conflicts:
	ap/ap/urls.py
Merge branch 'lifestudy-message' into dev