Merge branch 'release/v0.6.0' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/v0.6.1'
Merge branch 'hotfix/v0.6.1' into develop
Merge branch 'master' of git://github.com/Kelasi/kelasiTline
Merge branch 'master' of git://github.com/Kelasi/kelasiTline
Merge branch 'master' into develop

* master:
  Implemented markdown and other stuff from HTML::Pipeline
  Stupid work around for a cached image
  More polishment to the UI; Also trying to circumvent the sprocket cache problem.
Merge pull request #50 from mkhoeini/release/v0.7.0

Release/v0.7.0
Removed a redirect
Merge branch 'master' of git://github.com/Kelasi/kelasiTline
Merge branch 'master' into develop
Merge pull request #51 from mkhoeini/develop

v0.7.1
Added livereload
Merge branch 'master' of github.com:Kelasi/kelasiTline

* 'master' of github.com:Kelasi/kelasiTline:
  Removed a redirect
Merge branch 'master' into develop

* master:
Removed a memory leak and a ui bug for timeago
Merge branch 'release/v0.7.2'

* release/v0.7.2:
  Removed a memory leak and a ui bug for timeago
  Added livereload
Merge branch 'release/v0.7.2' into develop

* release/v0.7.2:
  Removed a memory leak and a ui bug for timeago
Migrated to bootstrap-3 and fixed some css bugs
Merge pull request #53 from saeedSarpas/release/v0.7.3

Release/v0.7.3