Fixed screen rotation bug and started working on sending intents from notifications
 Merged conflicts