disables manual input if JS date/time pickers are used, removed buttons, addresses #537, #538, #539
recompiled
remove private submodule (doesn't belong in public branches)
Merge pull request #547 from MartijnR/master

fix for transformation cache, logo is now an image
Merge pull request #548 from MartijnR/master

/surveys API fix, plus fix for www form launch, closes #521
Merge pull request #549 from MartijnR/master

upgraded jquery + unimportant stuff
Merge pull request #550 from MartijnR/master

hide disabled branches in preview (not sure why they where deliberately set not to), fix for forms app
Merge pull request #553 from MartijnR/master

minor stuffies
Merge pull request #557 from MartijnR/master

edited readme
reduced excessiveness of indentation in data controller (tssk)
Merge branch 'minimalistic_date_inputs' of https://github.com/modilabs/enketo

Conflicts:
	.gitmodules
	public/js-min/webform-iframe-all-min.js
	public/js-min/webform-preview-all-min.js
updated bootstrap-timepicker and added it as a git submodule instead
add reset button to JS date, time and date time pickers, closes #542,
updated tests
rebuilt js and css
don't enable branched file inputs if user has not yet given permission to use filesystem, closes #563
workaround for Chrome bug where file inputs remain in partially disabled state, closes #503
rebuilt js
test forms for #503
tried to correct time picker submodule, added file-manager submodule