Merge branch 'master' of https://github.com/Hotelsnl/standards

* 'master' of https://github.com/Hotelsnl/standards:
  bugfix and do not warn for globals
Merge branch 'master' of https://github.com/Hotelsnl/standards

* 'master' of https://github.com/Hotelsnl/standards:
  patch shizzle
Merge branch 'master' of https://github.com/Hotelsnl/standards

* 'master' of https://github.com/Hotelsnl/standards:
  Added references to the current accepted coding guidelines, styles, etc.
Merge branch 'master' of https://github.com/Hotelsnl/standards

* 'master' of https://github.com/Hotelsnl/standards:
  fix elseif()
Added ?: style ternary to allowed code.
Merge branch 'master' of github.com:doenietzomoeilijk/standards

* 'master' of github.com:doenietzomoeilijk/standards: