Added some doc
Changed a bit of tronix event
Merged
Merge branch 'screw_django' of https://github.com/AmoghReddy/engineer2013 into screw_django