kk
5/4/2014
Merge branch 'master' of https://github.com/dali-lab/Dekaaz

Conflicts:
	feed.js