Merge branch 'release/add-improved-reference-to-blog'
Merge branch 'release/1.3'
Merge branch 'release/1.4'
change image size, just fetch the medium sized image
added date tot tumblr posts, needs to be filtered by fontanel_time_ago though
added <a> to safe tags
added <a> here as well
added h2 to safe tags too
Merge branch 'refs/heads/develop'

Conflicts:
	fontanel-tumblr-importer.class.php
Merge branch 'master' of github.com:jasperkennis/fontanel-tumblr-importer
Merge branch 'release/2.0'
Triggering 10% before the actual div enters the view.
Raised the version number.
Merge branch 'hotfix/2.1' into develop