Fixed errors
Merge branch 'master' into daily-news

Conflicts:
	site/js/ajax.js
	site/js/whileaway.js
Merge branch 'master' into daily-news

Conflicts:
	site/js/ajax.js
	site/js/whileaway.js
HOTFIX: use right API