Merge branch 'develop'
Merge branch 'master' of github.com:jplusplus/feowl
Merge branch 'develop'
Update 11:35 AM
Merge branch 'master' of https://github.com/jplusplus/feowl
 Update 11:49 AM (readme)
Merge branch 'develop'
Merge branch 'master' of https://github.com/jplusplus/feowl
Survey form + a bit of smarty (test) : feowl.wasamundi.com
Test smarty: survey form (feowl.wasamundi.com)
Another push trial... (Merge branch 'master' of https://github.com/jplusplus/feowl)

Conflicts:
	UI/application/bootstrap.php
	UI/application/classes/controller/welcome.php
	UI/application/views/layout/header.tpl
	UI/application/views/layout/menu.tpl
	UI/application/views/tool/header-file.tpl
	UI/application/views/welcome.tpl
	UI/modules/smarty/README.md
	UI/modules/smarty/classes/controller/smartybenchmark.php
	UI/modules/smarty/classes/controller/smartydemo.php
	UI/modules/smarty/classes/kohana/smarty/helper.php
	UI/modules/smarty/classes/smarty/helper.php
	UI/modules/smarty/classes/smarty/view.php
	UI/modules/smarty/classes/view.php
	UI/modules/smarty/config/simpletest.php
	UI/modules/smarty/config/smarty.php
	UI/modules/smarty/init.php
	UI/modules/smarty/simpletests/templates/test_absolute.tpl
	UI/modules/smarty/simpletests/test_smarty3.php
	UI/modules/smarty/vendor/smarty/COPYING.lib
	UI/modules/smarty/vendor/smarty/README
	UI/modules/smarty/vendor/smarty/SMARTY_2_BC_NOTES.txt
	UI/modules/smarty/vendor/smarty/SMARTY_3.0_BC_NOTES.txt
	UI/modules/smarty/vendor/smarty/SMARTY_3.1_NOTES.txt
	UI/modules/smarty/vendor/smarty/change_log.txt
	UI/modules/smarty/vendor/smarty/libs/Smarty.class.php
	UI/modules/smarty/vendor/smarty/libs/SmartyBC.class.php
	UI/modules/smarty/vendor/smarty/libs/debug.tpl
	UI/modules/smarty/vendor/smarty/libs/plugins/block.textformat.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.counter.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.cycle.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.fetch.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_checkboxes.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_image.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_options.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_radios.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_select_date.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_select_time.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.html_table.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.mailto.php
	UI/modules/smarty/vendor/smarty/libs/plugins/function.math.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.capitalize.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.date_format.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.debug_print_var.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.escape.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.regex_replace.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.replace.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.spacify.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifier.truncate.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.cat.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.count_characters.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.count_sentences.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.count_words.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.default.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.escape.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.from_charset.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.indent.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.lower.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.noprint.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.string_format.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.strip.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.strip_tags.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.to_charset.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.unescape.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.upper.php
	UI/modules/smarty/vendor/smarty/libs/plugins/modifiercompiler.wordwrap.php
	UI/modules/smarty/vendor/smarty/libs/plugins/outputfilter.trimwhitespace.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.escape_special_chars.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.literal_compiler_param.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.make_timestamp.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.mb_str_replace.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.mb_unicode.php
	UI/modules/smarty/vendor/smarty/libs/plugins/shared.mb_wordwrap.php
	UI/modules/smarty/vendor/smarty/libs/plugins/variablefilter.htmlspecialchars.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_cacheresource.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_cacheresource_custom.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_config_source.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_append.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_assign.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_block.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_break.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_call.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_capture.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_continue.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_debug.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_eval.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_extends.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_for.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_function.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_if.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_include.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_insert.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_section.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compile_while.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_compilebase.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_config.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_configfileparser.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_data.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_debug.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_filter_handler.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_get_include_path.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_parsetree.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_eval.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_extends.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_file.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_php.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_registered.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_stream.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_resource_string.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_template.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_templatebase.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_templatelexer.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_templateparser.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_utility.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_internal_write_file.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_resource.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_resource_custom.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_resource_recompiled.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_resource_uncompiled.php
	UI/modules/smarty/vendor/smarty/libs/sysplugins/smarty_security.php
	UI/modules/smarty/views/demo/benchmark.tpl
	UI/modules/smarty/views/demo/forum_forum.php
	UI/modules/smarty/views/demo/forum_forum.tpl
	UI/modules/smarty/views/smarty_demo.tpl
	UI/modules/smarty/views/smarty_demo_include.tpl
	UI/modules/smarty/views/smarty_demo_page.tpl
	UI/modules/smarty/views/smarty_test/include.tpl
	UI/modules/smarty/views/smarty_test/included_file.tpl
	UI/modules/smarty/views/smarty_test/layout.tpl
	UI/modules/smarty/views/smarty_test/mypage.tpl
	UI/modules/smarty/views/smarty_test/myproject.tpl
	UI/modules/smarty/views/smarty_test/test.tpl
	UI/modules/smarty/views/smarty_test/test2.tpl
	UI/modules/smarty/views/smarty_test/test_php.php
Changed that travis only test feowl test
Rollback to avoid c4ff997ce39fa8174a505d59a5df66f4a93f7b83 conflicts
Merge remote-tracking branch 'origin/develop'

Conflicts:
	UI/application/bootstrap.php
	UI/application/views/layout/header.tpl
	UI/application/views/layout/menu.tpl
	UI/application/views/welcome.tpl
	UI/assets/css/bootstrap.min.css
Revomed some merge misunderstandings
Updated menu URL and Bootstrap route
Merge branch 'master' into develop