Added library for SwipeViews and fixed gradle stuff
Fixed merge stuff