Update 0.13
Merge branch 'master' of https://github.com/adarkshine/nutrition-library

Conflicts:
	www/config.xml