Merge with SVN

- cleanup
- Improvements in form
Support for automatic form filling
Indentation, cleanup and fix on JS