Fix ( Added fixes ) : Makefile and Model fixes.
Merge branch 'develop' of https://github.com/AMRoche/SophiasPets into develop