Added radio buttons for follow and unfollow proposals
Merge branch 'userProfile' into test

Conflicts:
	src/digidemo/ajax.py
	src/digidemo/templates/digidemo/overview.html