merge
Added splash unlock animation, added views package and DraggableView object