changed licence footer text, fixed merge mess