Conflict resolved
Conflict resolved
Conflict resolved
Conflict resolved for ui.sh
[ui_support_ssl_node] error handling in case if certificates could not be read
[ui_support_ssl_node] request serving correction
[ui_support_ssl_node] redirect corrected
[ui_support_ssl_node] tls, ssl implemented for UI
[ui_support_ssl_node] nodejs middleware for redirecting corrected.
[coopr-542] changes on PR comments
[coopr-542] indentaion changes, sh scripts changes.
[coopr-542] nerge conflict resolved
[coopr-542] http to https forwarding removed
[coopr-542] checks on missing certification files added for ngui/server.js
include main-bower-files dependency
Merge branch 'develop' into feature/ngui-shared-modules
modify gulpfile to load cask-angular-* main bower files
harder mainBowerFiles regex
update to angular 1.3.1 and fix select with trackby expr
rm console.log