tree 4d4dc604c583c55fcef31b11bce46192b4f50ddc
parent 598dfea2ff246a5c21cdb1cca6505f17a6d72752
parent 5f8a3b921d1ac51dce0bc26d6cba5b141906e0cc
author ndelvos78 <nina.delvos@kuelap.io> 1504828332 -0400
committer ndelvos78 <nina.delvos@kuelap.io> 1504828332 -0400

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	Pages/Customers.js
#	Specs/gate1.js