Merge branch 'release/0.0.1'
Merge branch 'develop'
Merge branch 'release/0.1'
add /one
Merge branch 'master' of github.com:alswl/nami
update: README
Merge branch 'release/0.2'

Conflicts:
	nami/urls.py
	templates/one.html
	web/page.py
Merge branch 'release/0.2.1'