gradle up to new versions
style folder values-v21 and action bar base color styling
Merge remote-tracking branch 'origin/master'