uiyh
jfy
Merge branch 'master' of https://hanamn@github.com/hanamn/pft.git

Conflicts:
	js/ctrl/ng.js