Add stuff from 18.11.2013
Add stuff from 18.11.2013
Remove old LA stuff (not needed)