added stuff to developer branch
Merge branch 'developer'