Tests for url funcs and view funcs
Merge branch 'master' of https://github.com/lxylinki/cyan

Conflicts:
	views.py