141207 frontend_admin_lee

merged differencies between TD's last commits and mine.