Notification testing push.
Merge branch 'pivotalTracker'
Merge branch 'pivotalTracker'
Stopped tracking .gradle folder
Fixed notification.
Merge branch 'master' of https://github.com/Sajfer/EDA397-Group6

Conflicts:
	app/src/main/java/com/EDA397/Navigator/NaviGitator/Services/NotificationService.java
Fixed manifest.
Fixed intent issue for notifications.
Fixed intent issue for notifications.
Added new Activities for each notification.
Added forwarder classes to manifest.
Added conflictnotifications based on separate files (expand to see which branches file was changed in).
Changed notification icons to minitator.png.
Added autorefresh commit list on branch selection.
Merge branch 'master' into pivotalTracker