Windows support of master: string to char * and no "or"/"and" keywords
Merge branch 'master' of github.com:acado/acado
Fixed addTemplate.m (matlab interface)
Cleaned some headers