Adding bower main file thanks to @Tomtomgo

https://github.com/Urigo/angular-embedly/issues/10
updating version
Fix merge conflict