saving before merge
Merge branch 'master' of https://github.com/alexnedelcu/Dr-Smoothie
Merge branch 'master' of https://github.com/alexnedelcu/Dr-Smoothie

Conflicts:
	BackEnd/drsmoothie/rest/views.py
fixing merge stuff
start refactoring utils
renamed portion and weight models, refactored Ingredients view, added ingredient jsonconvert in utils