Added push notification classes
Added the ability to merge manifest files from library project
Merge pull request #396 from bhariharan/unstable

Added the ability to merge manifest files from library project
Merge branch 'unstable' into push_notifications