Fix for modal windows.
Fix for modal windows
Merge branches 'master' and 'master' of https://github.com/dkuk/a_common_libs