Signed-off-by: Aryunov Mikhail <rtti@mail.ru>
Merge branch 'master' of https://github.com/liaozhai/W3

Conflicts:
	node/thistle/public/scripts/app/views/app.js