Merged in fixes for Issue #121

Name conflicts with AppCompat v7 21.0.0