bug fixes
Merge branch 'dev' of github.com:dbottillo/AMultiItemListAdapter into dev