Merge pull request #6 from prsnca/master

Pull updates from Yaron
django toolbar added
Merge pull request #7 from itayB/master

pull