Added git management convention
Merge branch 'stable'

Update Master to include tags