Admin Update 20.12.2013
Merge remote-tracking branch 'origin/master'