Add masquerade module (+ fix order and line end)
Merge branch 'dev' of github.com:radimklaska/D7_base into dev