Merge branch 'master' of https://github.com/Keenetic/angularproject

Conflicts:
	protected/runtime/application.log