test2
Merge branch 'master' of https://github.com/jamesfebin/boutline4sports

Conflicts:
	client/views/fanprefs/choosesport.html~
copypasted from cloud git