Pre Back-/Frontend merge check in. Some API changes as discussed on 28.01.2013. Some design changes to implement arguments.