version 1.2a

- added braces for the \tikz command since it crashes with babel french
option
- replaced \tikstyle with \tikzset
Merge branch 'version-1.2a'
prepared v1.2a for upload

and added make file