Merge branch 'develop' into 88-welcome-message

Dockerfile

@@ -4,9 +4,14 @@ FROM node:8.2
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
+# use changes to package.json to force Docker not to use the cache
+# when we change our application's nodejs dependencies:
+ADD package.json /usr/src/app
+RUN npm install
+
 # Install app dependencies
 COPY . /usr/src/app
-RUN npm install && npm run build
+RUN npm run build
 
 VOLUME /usr/src/app/build
 

src/components/footer.js

@@ -25,7 +25,7 @@ class Footer extends Component {
   render() {
     return (
       <footer className="app-footer">
-        Copyright &copy; {new Date().getFullYear()}
+        Copyright &copy; {new Date().getFullYear()} - <a href="https://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> - <a href="https://www.rwth-aachen.de">RWTH Aachen University</a>
       </footer>
     );
   }

src/components/menu-sidebar.js

@@ -34,7 +34,7 @@ class SidebarMenu extends React.Component {
           <li><NavLink to="/simulations" activeClassName="active" title="Simulations">Simulations</NavLink></li>
           <li><NavLink to="/simulators" activeClassName="active" title="Simulators">Simulators</NavLink></li>
           { this.props.currentRole === 'admin' ? 
-              <li><NavLink to="/users" activeClassName="active" title="User Management">User Management</NavLink></li> : ''
+              <li><NavLink to="/users" activeClassName="active" title="User Management">Users</NavLink></li> : ''
           }
           <li><NavLink to="/logout" title="Logout">Logout</NavLink></li>
         </ul>

src/styles/app.css

@@ -80,6 +80,10 @@ body {
   clear: both;
 }
 
+.app-footer a {
+  color: #333;
+}
+
 .app-body {
   padding: 15px 5px 0px 5px;
 }
@@ -136,7 +140,7 @@ body {
 .menu-sidebar ul {
   padding-top: 10px;
   list-style: none;
-  white-space: nowrap;  
+  white-space: nowrap;
 }
 
 .menu-sidebar a::after {