Merge https://github.com/vzbyan/instacalc

Conflicts:
	www/config.xml
Merge branch 'master' of https://github.com/vzbyan/instacalc