added unique field template with bootstrap typeahead functionality
Merge remote-tracking branch 'origin/server_nolanguage_fixes' into testcase
Merge remote-tracking branch 'origin/master' into testcase
Merge branch 'master' of https://github.com/HSWebteam/ultraform into testcase
Merge branch 'other_readme' of https://github.com/HSWebteam/ultraform into testcase
Merge branch 'master' of https://github.com/HSWebteam/ultraform into nieuwebranch
Merge branch 'server_multiple_forms' of https://github.com/HSWebteam/ultraform into nieuwebranch
pre switch commit
merging master into my testing branch
Fixes a warning that appears if a JSON data file is empty.
added dual form, upload field, templating
Merge pull request #87 from HSWebteam/server_fix_empty_json

Fixes a warning that appears if a JSON data file is empty.
Merge pull request #90 from HSWebteam/nieuwebranch

Updates to the Magic testcase
Merge pull request #85 from HSWebteam/client_radiobuttons

Client radiobuttons
Update template.php

Removed javascript that was not used anymore.
merge conflict solved