added Tool Tips
Merge origin/development into development
added Tool Tips