Merge branch 'tag-0.1' into development
Cleaned up package.json dependencies
Merge branch 'dependency-fix' into development
Pushing recent changes and missing files
Merge branch 'development' of https://code.google.com/p/yarse into development
Renamed model/ingredient/static folder to /data, so that it won't be excluded by .gitignore
Enabled caching for FatSecret API
unstable commit for tests on other machine
Fixed cache bug
Added refresh on click at Recipe screen header; Set weights to 1 (ignore to 0, view to 0); Enabled display of 10 recipes out of 20 received
Merge branch 'demo-finish' into development
Fixed ingredient overlap calculation, now overlap displayed instead of recipe short text
Switching to tag 0.2.0
Merge branch 'tag-0.2' into development
Merge branch 'development'