add front pages
add detial views of ingredient
modify ingredient module
add config
update the hierarchy
update to django 1.7
update django to 1.7.1
Merge commit '7d7f3c1d4313a632f09f28a76b240774032c5565'

Conflicts:
	source/server/server/settings.py