* fixes
+ libs
Merge branch 'master' of https://github.com/yandex-shri-minsk-2014/team-3

Conflicts:
	public/js/appx.js