modify
Merge branch 'master' of https://github.com/blackshirt/webapt

Conflicts:
	webapt/core.py
Modified core
Merge branch 'master' of https://github.com/blackshirt/webapt

Conflicts:
	webapt/core.py
Merge branch 'master' of https://github.com/blackshirt/webapt
Modify core.py
Add paket view