tableview changes
merge conflict icxtableview
Merge branch 'master' of github.com:puffball/freebeer