Update of master branch#321

Merged

opticod merged 9 commits intomasterfrom

Dec 22, 2016

Commits on Dec 15, 2016

Match template dublicacy fixed.
free4murad
committed
Fixed issue #271
jainkuniya
committed

Commits on Dec 19, 2016

Fixed codacy check
jainkuniya
committed

Commits on Dec 20, 2016

git push origin bug-fixesMerge branch 'vishwesh3-deleteIssue' into bug-fixes
opticod
committed