More tasks and updated mockup-images
Merge branch 'dev' of github.com:drowzyorginal/ETS170-GROUP-E into dev