Fixed varius issues concerning Sadegh's comments
Merge pull request #47 from saeedSarpas/release/v0.6.0

Release/v0.6.0
Merge branch 'release/v0.6.0'
Merge branch 'release/v0.6.0' into develop
Merge branch 'master' into develop
Fixed timeline.haml.html syntax error
Merge pull request #48 from saeedSarpas/hotfix/v0.6.1

Hotfix/v0.6.1
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 github.com:Kelasi/kelasiTline

* 'master' of github.com:Kelasi/kelasiTline:
  Fixed timeline.haml.html syntax error
  Fixed varius issues concerning Sadegh's comments
  First version of timeline GUI
  Updated bootstrap-sass from github repo to version 3
  Modified sidebar to work right in responsive mode
  Added kelasiTline logo
  Added left sidebar to timeline layout
  Created timelineModule in timeline.js
Merge branch 'master' into develop

* master:
  Fixed timeline.haml.html syntax error
  Fixed varius issues concerning Sadegh's comments
  First version of timeline GUI
  Updated bootstrap-sass from github repo to version 3
  Modified sidebar to work right in responsive mode
  Added kelasiTline logo
  Added left sidebar to timeline layout
  Created timelineModule in timeline.js
Added memcached caching and session store
Removed bootstrap-responsive so atleast timeline would work!
Merge branch 'develop'

* develop:
  Removed bootstrap-responsive so atleast timeline would work!
  Added memcached caching and session store
Some Modifications for heroku
Merge branch 'master' into develop

* master:
  Some Modifications for heroku
Merge branch 'master' of git://github.com/Kelasi/kelasiTline
Made the command bar more fantastic
Merge branch 'develop'

* develop:
  Made the command bar more fantastic