prepare table view
Merge pull request #15 from jsilvestre/master

Various small changes
merging process
merge & brunched
prepare rebase from master
Brunched