Merge pull request #595 from wallabag/dev

wallabag 1.6.0
Merge pull request #634 from wallabag/dev

1.6.1
Added PHPePub
Merge pull request #712 from wallabag/dev

1.7, call me "Premium version"
Merge pull request #761 from wallabag/dev

1.7.1
security fix
1.7.2
Merge branch 'fix/securityMaster'
Merge branch 'master' into dev

Conflicts:
	index.php
Merge branch 'dev'