Bump prettyPhoto to version 3.1.5
Modify "hook" from default 'rel' to 'data-rel'
Keep slideshow in false
Keep theme in 'facebook'
Merge branch 'master' into develop

* master:
  Content script works and loads scans !
Bump simplemodal to version 1.4.4.

Signed-off-by: Braiam Peguero <braiamp@gmail.com>
If there are no bookmarks just skip it.
Change tabs indentation for spaces.

Signed-off-by: Braiam Peguero <braiamp@gmail.com>
Added missing icons

Signed-off-by: Braiam Peguero <braiamp@gmail.com>
Moved inline JavaScript out options.html

Signed-off-by: Braiam Peguero <braiamp@gmail.com>
Get rid of silly javascript remants.
changed sendrequest to sendmessage

sendrequest/onrequest were superceded by sendmessage/onmessage in chrome
20, callback function is optional.
changed indentation to 2 space standard
moving css out of html
Fix selected chapter in popup list

Fix selected chapter in popup list
Add a loading image if chapter list is not yet loaded in list
Fix options page

Fiw bugs in options page
- css fix
- event binding (the jquery way) !! Do not forget to embed event binding
in a $function() {...}); to wait for the DOM to be loaded !!!
- @Daniel Loomer do not use sendMessage because background page is using
onRequest
Final check to options page

JSLint options.js
Validation of HTML
Removed unnused CSS
Changed from vendor specific CSS rules to general use
Moving jQuery.scrollTo out back.js

Updated jQuery to version 1.4.3.1
Fixed version number in manifest.json
moved inline script out of import-export

fixed the inline javascript/onclicks, linted and reindented. Fixed a
couple minor issues.
Merge commit '5a7760b3f740645487ef70600eb144b143de7080' into develop

* commit '5a7760b3f740645487ef70600eb144b143de7080':
  Fixed version number in manifest.json
Merge branch 'develop' of github.com:AllMangasReader-dev/AMR into develop

# By Daniel Loomer
# Via Daniel Loomer
* 'develop' of github.com:AllMangasReader-dev/AMR:
  moved inline script out of import-export
Setting version to 1.5.0
Merge branch 'develop' of github.com:AllMangasReader-dev/AMR into develop

* 'develop' of github.com:AllMangasReader-dev/AMR:
  Fixed version number in manifest.json yet again

Conflicts:
	manifest.json