Merged neo to master
merged neo to master
Fixed order of CSS and JS inclusion

Added variables custom_css_id and custom_js_id to modules args and
modularised code for it.