merge from branch to trunk (it compiles)



git-svn-id: svn://svn.code.sf.net/p/acado/code/trunk@136 f4037fd0-e48f-4cc9-9f8e-e12ed3b76bf3