disabled animations
merge conflic
Merge branch 'master' of github.com:Lauricio/template3

* 'master' of github.com:Lauricio/template3:
  fav speaker fix
  globalhandelers 4
  globalhandelers 3
  globalhandelers
  fix
  -d
  d
  s
  mandrilla added
  filepickef added
  smallfixe on map