Merge pull request #10 from EnginesOS/master

Merge pull request #9 from EnginesOS/current
form refactoring
Merge branch 'current' of ssh://github.com/EnginesOS/SystemGui

Conflicts:
	app/views/shared/gadgets/_form_field_inline.html.erb