Merge branch 'master' into Kevin
validation tooltip
Merge branch 'master' into Kevin
used new timeout function
resolve conflict
added outerHeight, changed timeout value
Merge branch 'Kevin'