Merge branch 'master' of github.com:renzon/tekton

Conflicts:
	.gitignore
	LICENSE
	README.md
	backend/appengine/app.yaml
	backend/appengine/index.yaml
	backend/appengine/manager.py
	backend/appengine/routes/courses/home.py
	backend/appengine/routes/courses/rest.py
	backend/appengine/routes/login/passwordless.py
	backend/appengine/routes/logout.py
	backend/appengine/settings.py
	backend/appengine/templates/base/base.html
	backend/appengine/templates/home.html
	backend/appengine/templates/login/home.html
	backend/apps/locale_app/middleware.py
	backend/apps/permission_app/model.py
	backend/build_scripts/babel/i18n_extractor.py
	backend/build_scripts/babel/locale/en_US/LC_MESSAGES/messages.po
	backend/build_scripts/babel/locale/pt_BR/LC_MESSAGES/messages.po
	backend/test/testloader.py
	backend/venv/requirements.txt
	backend/venv/venv.sh