megred conflict
added dutch translations
Update to make it work on 1.3

Adding icon to sidebar link
Update Versionfile and gemspec.
Add pt-BR translation thanks to @lolcode. [Fix #47]
Allow 1.3.0.rc1 to be used.
Update gemspec for stable 1.3.x release.
added es.yml translations
bumping for master version
Promo is now part of Core. [Fix #52]
fixes markup on 'new relation type' button
Merge branch 'fix-markup-on-new-relation-type-button' of https://github.com/jsqu99/spree_related_products
fixes markup on 'new relation type' button

Fixes #54
fixes autocomplete of product and replaces jquery.live
Merge pull request #56 from jsqu99/fix_jquery_live_and_autocomplete

Fixes jquery live and product autocomplete
Cleanup travis.yml
Update Versionfile
spree_core won't support 1.8.7 anymore
Fix the specs.
Merge pull request #27 from imme5150/update_discount_amount

Edit discount amount