Added make file with varnsih and expire module
Merge branch 'development' into release