Make snapshot

This commit preserves changes remotely.
Merge commit
Merge remote-tracking branch 'origin/senchastruct-snapshot' into senchastruct

Conflicts:
	phonegap/www/app.js

Add Siesta testing to the project