test

Signed-off-by: vzbyan <vzbyan@gmail.com>
Merge https://github.com/vzbyan/instacalc

Conflicts:
	www/config.xml