commiting last changes
Merge branch 'fluo-version' of https://github.com/InQBarna/android-swipelistview into fluo-version