merge master to issues model
merge issues
fixed merge conflicts
merged in issues branch with globals