Start working on more notification type client side support
Merge branch 'master' into more-notifications
Merge branch 'master' into more-notifications
Enable competition level starting notification
Start working on more notification type client side support
Enable competition level starting notification
Implement notification priority for android >= 16
Will allow the system to show some notifications as heads up on 5.0
Update built target & build tools to v21
Add notification settings only for lollipop devices
Allows user to change lock screen and heads up settings. See #264
Add notification category
Merge branch 'more-notifications' of github.com:the-blue-alliance/the-blue-alliance-android into more-notifications
Merge branch 'android-l-update' into more-notifications

Conflicts:
	android/build.gradle
	android/src/main/java/com/thebluealliance/androidclient/activities/settings/NotificationSettingsActivity.java
	android/src/main/java/com/thebluealliance/androidclient/models/Event.java
Implement schedule updated notification
Implement awards posted notification
Implement alliances updated notification
Implement district points updated notification
Award Name updates
Store data locally after a notification pushes is
Merge branch 'android-l-update' into more-notifications

Conflicts:
	android/src/main/java/com/thebluealliance/androidclient/accounts/UpdateUserModelSettings.java
	android/src/main/java/com/thebluealliance/androidclient/background/UpdateMyTBA.java
	android/src/main/java/com/thebluealliance/androidclient/gcm/GCMMessageHandler.java
Merge pull request #290 from the-blue-alliance/more-notifications

More notifications