Global
Merge branch 'patch24' of https://github.com/Chomiciak/PufferPanel into patch24

Conflicts:
	.gitignore
	LICENSE
	README.md
	app/languages/build/index.php
	app/languages/de.txt
	app/languages/en.txt
	app/languages/es.txt
	app/languages/fr.txt
	app/languages/pt.txt
	app/languages/ru.txt
	app/languages/se.txt
	app/languages/zh.txt
	app/templates/server.properties.tpl
	app/views/admin/account/find.html
	app/views/admin/account/new.html
	app/views/admin/account/permissions/perms.html
	app/views/admin/account/view.html
	app/views/admin/config/captcha.html
	app/views/admin/config/email.html
	app/views/admin/config/global.html
	app/views/admin/config/urls.html
	app/views/admin/index.html
	app/views/admin/node/add.html
	app/views/admin/node/list.html
	app/views/admin/node/view.html
	app/views/admin/server/add.html
	app/views/admin/server/find.html
	app/views/admin/server/view.html
	app/views/admin_base.html
	app/views/base.html
	app/views/node/console.html
	app/views/node/files/ajax/list_dir.html
	app/views/node/files/edit.html
	app/views/node/files/index.html
	app/views/node/index.html
	app/views/node/plugins/index.html
	app/views/node/plugins/search.html
	app/views/node/plugins/view.html
	app/views/node/settings.html
	app/views/panel/account.html
	app/views/panel/index.html
	app/views/panel/password.html
	app/views/panel/servers.html
	app/views/panel/totp.html
	composer.json
	nt
	panel/account.php
	panel/admin/account/ajax/account/password.php
	panel/admin/account/ajax/account/update.php
	panel/admin/account/ajax/new/create.php
	panel/admin/account/ajax/search/advanced.php
	panel/admin/account/ajax/search/getall.php
	panel/admin/account/ajax/search/simple.php
	panel/admin/account/find.php
	panel/admin/account/new.php
	panel/admin/account/permissions/perms.php
	panel/admin/account/view.php
	panel/admin/api/view.php
	panel/admin/config/actions/captcha.php
	panel/admin/config/actions/cname.php
	panel/admin/config/actions/email.php
	panel/admin/config/actions/general.php
	panel/admin/config/actions/url.php
	panel/admin/config/captcha.php
	panel/admin/config/email.php
	panel/admin/config/global.php
	panel/admin/config/urls.php
	panel/admin/index.php
	panel/admin/install/do/account.php
	panel/admin/install/do/hash.php
	panel/admin/install/do/settings.php
	panel/admin/install/do/start.php
	panel/admin/install/do/tables.php
	panel/admin/install/index.php
	panel/admin/install/install.lock.dist
	panel/admin/node/add.php
	panel/admin/node/ajax/get_status.php
	panel/admin/node/ajax/new/create.php
	panel/admin/node/ajax/ports/add_port.php
	panel/admin/node/ajax/ports/delete.php
	panel/admin/node/ajax/ports/new_ip.php
	panel/admin/node/ajax/update/basic.php
	panel/admin/node/ajax/update/sftp.php
	panel/admin/node/list.php
	panel/admin/node/view.php
	panel/admin/pages/api/view.php
	panel/admin/pages/configuration/actions/captcha.php
	panel/admin/pages/configuration/actions/cname.php
	panel/admin/pages/configuration/actions/cookies.php
	panel/admin/pages/configuration/actions/email.php
	panel/admin/pages/configuration/actions/general.php
	panel/admin/pages/configuration/actions/url.php
	panel/admin/pages/configuration/edit.php
	panel/admin/pages/configuration/global.php
	panel/admin/pages/node/ajax/update/sftp.php
	panel/admin/server/add.php
	panel/admin/server/ajax/new/create.php
	panel/admin/server/ajax/new/load_list.php
	panel/admin/server/ajax/search/advanced.php
	panel/admin/server/ajax/search/getall.php
	panel/admin/server/ajax/search/simple.php
	panel/admin/server/ajax/server/allocate.php
	panel/admin/server/ajax/server/connection.php
	panel/admin/server/ajax/server/sftp.php
	panel/admin/server/find.php
	panel/admin/server/view.php
	panel/ajax/account/totp.php
	panel/ajax/get_status.php
	panel/ajax/set_language.php
	panel/ajax/validate_ftp.php
	panel/api/functions/api.core.php
	panel/api/functions/api.init.php
	panel/api/functions/modules/module.add.php
	panel/api/functions/modules/module.delete.php
	panel/api/functions/modules/module.functions.php
	panel/api/functions/modules/module.information.php
	panel/api/functions/modules/module.validate.php
	panel/api/index.php
	panel/assets/css/bootstrap.css
	panel/assets/css/fontawesome/font-awesome.min.css
	panel/assets/css/fontawesome/fonts/FontAwesome.otf
	panel/assets/css/fontawesome/fonts/fontawesome-webfont.eot
	panel/assets/css/fontawesome/fonts/fontawesome-webfont.svg
	panel/assets/css/fontawesome/fonts/fontawesome-webfont.ttf
	panel/assets/css/fontawesome/fonts/fontawesome-webfont.woff
	panel/assets/javascript/admin.min.js
	panel/assets/javascript/bootstrap.min.js
	panel/assets/javascript/chartjs/chart.core.js
	panel/assets/javascript/chartjs/chart.line.js
	panel/assets/javascript/jquery.cookie.js
	panel/assets/javascript/jquery.debounce.js
	panel/assets/javascript/jquery.redirect.min.js
	panel/assets/javascript/socket.io.min.js
	panel/index.php
	panel/logout.php
	panel/node/ajax/console/power.php
	panel/node/ajax/files/list_dir.php
	panel/node/ajax/files/save.php
	panel/node/ajax/overview/data.php
	panel/node/ajax/plugins/install.php
	panel/node/ajax/settings/jarname.php
	panel/node/ajax/settings/modpack.php
	panel/node/ajax/settings/sftp.php
	panel/node/console.php
	panel/node/files/edit.php
	panel/node/files/index.php
	panel/node/index.php
	panel/node/plugins/index.php
	panel/node/plugins/search.php
	panel/node/plugins/view.php
	panel/node/settings.php
	panel/password.php
	panel/servers.php
	panel/totp.php
	src/captcha/LICENSE
	src/captcha/recaptchalib.php
	src/framework/framework.auth.php
	src/framework/framework.core.php
	src/framework/framework.database.connect.php
	src/framework/framework.email.php
	src/framework/framework.files.php
	src/framework/framework.functions.php
	src/framework/framework.language.php
	src/framework/framework.log.php
	src/framework/framework.page.php
	src/framework/framework.query.php
	src/framework/framework.server.php
	src/framework/framework.settings.php
	src/framework/framework.user.php
	src/framework/lang/de.json
	src/framework/lang/en.json
	src/framework/lang/es.json
	src/framework/lang/fr.json
	src/framework/lang/pt.json
	src/framework/lang/ru.json
	src/framework/lang/se.json
	src/framework/lang/zh.json
	src/include/admin.php
	src/include/footer.php
	src/include/header.php
	src/logs/.githold
	src/templates/admin_sidebar.php
	src/versions/current