merge to develop
Squashed commit of the following:

commit 81d13e465e7944ef175500ab743aa5a9b1eb9faa
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Mon Sep 15 08:50:22 2014 +0200

    einde weekend

commit ec9f9f9d729a33faec1499228ac4c2eb243d48e8
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Thu Sep 11 22:22:52 2014 +0200

    fixed voting

commit ab4fff004570b59641bfc3aae4057571869e7622
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 17:47:56 2014 +0200

    einde 11-9-14

commit 005f203c4bdbac02a58a558084d334ffe23b034a
Merge: 481a79c 694011d
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 09:17:27 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

commit 481a79cb09c637d3e82c998e2fcf4a84524789b8
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 09:17:18 2014 +0200

    late pull... oeps

commit 694011d655b71e4fd7b6ca26000de89f40456b2e
Merge: b66fa60 fde30df
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Sep 10 18:28:25 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	rest/submit.php

commit b66fa60f5281c9fb0bd238db150360f754a55d0a
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Sep 10 18:23:22 2014 +0200

    route submit.php

commit fde30dfe5ea31735961029317a81642ed7c00226
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Wed Sep 10 17:47:01 2014 +0200

    einde 10-9-14

commit 33eccaca806c0b43c6ed21a7d85e227e89c9c6a0
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Tue Sep 9 22:19:30 2014 +0200

    Submit user data to DB

commit a9f60eefdca4bdaad26fbece95781b22195cf6d9
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Tue Sep 9 09:01:20 2014 +0200

    ready fotos

commit a69e72eb7a04d63b0b85f50d4dfbe7a648d01bbe
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Mon Sep 8 17:37:47 2014 +0200

    work on DB getpictures

commit 5f5c6eefce9302d58ecfffc5ced8d2d00fc62c1b
Merge: 5d5dee8 e923ac9
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 13:48:32 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	app.php

commit 5d5dee8dd59a42e5f8f02652089ba36c64688866
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 12:46:04 2014 +0200

    get JSON for form to work

commit e923ac9e445655ec0d39f49606b6f74ebf16e6b6
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 12:46:04 2014 +0200

    get JSON for form to work

commit c203c9a40122cfa68a46aaf6d8a97ffda981b7f9
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 13:02:41 2014 +0200

    eind 29-8

commit 150721c4f5ddfa7707ec9d892f0703a1990f948c
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:33:06 2014 +0200

    some photo deletes

commit 9f4febd278a1f17d971fe7c99a0b4cdb2c61f0ba
Merge: c6262b4 54ad063
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:32:24 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	.gitignore

commit c6262b43177ca71bf201b4dff0bf2a128cea49a1
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:24:44 2014 +0200

    more on ignore

commit 54ad063d76cdd04ccdcde55614d7add586dc1532
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Fri Aug 29 07:27:29 2014 +0200

    eind 28-8

commit 8c0fedc9547e76ddd1b33b7e9b65a31ba864d7f3
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Thu Aug 28 20:15:59 2014 +0200

    DB to Json versie met JSON encode

commit 7facb8d73f9b1200519fa1ffba6e9f35a7d10a76
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Aug 28 15:30:37 2014 +0200

    hook up database Smaaktest

    - aanpassinegn aan REST en database
    - start met bouwen dynamisch formulier

commit 6bbd2d6cbc6a9937ea8d3815bb4596ba552d8573
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Aug 27 22:22:01 2014 +0200

    fixed 2e controller, update picture array

commit 514c06a68ef0f5eb5f8a11a869da67154d27cc91
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Wed Aug 27 11:28:09 2014 +0200

    1e commit from Brecker
clean up sass cache
Squashed commit of the following:

commit d28ce7c38ab726f8f5e7c1f7c38b1f60304d44f2
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 15 13:44:50 2014 +0200

    building Admin rest edit

commit e06577cc4e3949c61411470d9efb08eb8ca63d14
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 15 09:46:49 2014 +0200

    delete test.php

commit 81d13e465e7944ef175500ab743aa5a9b1eb9faa
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Mon Sep 15 08:50:22 2014 +0200

    einde weekend

commit ec9f9f9d729a33faec1499228ac4c2eb243d48e8
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Thu Sep 11 22:22:52 2014 +0200

    fixed voting

commit ab4fff004570b59641bfc3aae4057571869e7622
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 17:47:56 2014 +0200

    einde 11-9-14

commit 005f203c4bdbac02a58a558084d334ffe23b034a
Merge: 481a79c 694011d
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 09:17:27 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

commit 481a79cb09c637d3e82c998e2fcf4a84524789b8
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Sep 11 09:17:18 2014 +0200

    late pull... oeps

commit 694011d655b71e4fd7b6ca26000de89f40456b2e
Merge: b66fa60 fde30df
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Sep 10 18:28:25 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	rest/submit.php

commit b66fa60f5281c9fb0bd238db150360f754a55d0a
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Sep 10 18:23:22 2014 +0200

    route submit.php

commit fde30dfe5ea31735961029317a81642ed7c00226
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Wed Sep 10 17:47:01 2014 +0200

    einde 10-9-14

commit 33eccaca806c0b43c6ed21a7d85e227e89c9c6a0
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Tue Sep 9 22:19:30 2014 +0200

    Submit user data to DB

commit a9f60eefdca4bdaad26fbece95781b22195cf6d9
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Tue Sep 9 09:01:20 2014 +0200

    ready fotos

commit a69e72eb7a04d63b0b85f50d4dfbe7a648d01bbe
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Mon Sep 8 17:37:47 2014 +0200

    work on DB getpictures

commit 5f5c6eefce9302d58ecfffc5ced8d2d00fc62c1b
Merge: 5d5dee8 e923ac9
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 13:48:32 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	app.php

commit 5d5dee8dd59a42e5f8f02652089ba36c64688866
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 12:46:04 2014 +0200

    get JSON for form to work

commit e923ac9e445655ec0d39f49606b6f74ebf16e6b6
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Mon Sep 8 12:46:04 2014 +0200

    get JSON for form to work

commit c203c9a40122cfa68a46aaf6d8a97ffda981b7f9
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 13:02:41 2014 +0200

    eind 29-8

commit 150721c4f5ddfa7707ec9d892f0703a1990f948c
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:33:06 2014 +0200

    some photo deletes

commit 9f4febd278a1f17d971fe7c99a0b4cdb2c61f0ba
Merge: c6262b4 54ad063
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:32:24 2014 +0200

    Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

    Conflicts:
    	.gitignore

commit c6262b43177ca71bf201b4dff0bf2a128cea49a1
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Fri Aug 29 09:24:44 2014 +0200

    more on ignore

commit 54ad063d76cdd04ccdcde55614d7add586dc1532
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Fri Aug 29 07:27:29 2014 +0200

    eind 28-8

commit 8c0fedc9547e76ddd1b33b7e9b65a31ba864d7f3
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Thu Aug 28 20:15:59 2014 +0200

    DB to Json versie met JSON encode

commit 7facb8d73f9b1200519fa1ffba6e9f35a7d10a76
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Thu Aug 28 15:30:37 2014 +0200

    hook up database Smaaktest

    - aanpassinegn aan REST en database
    - start met bouwen dynamisch formulier

commit 6bbd2d6cbc6a9937ea8d3815bb4596ba552d8573
Author: Ralph zelf <ralph@lefthandmedia.com>
Date:   Wed Aug 27 22:22:01 2014 +0200

    fixed 2e controller, update picture array

commit 514c06a68ef0f5eb5f8a11a869da67154d27cc91
Author: lefthandmedia <bob@lefthandmedia.com>
Date:   Wed Aug 27 11:28:09 2014 +0200

    1e commit from Brecker
Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5 into develop

Conflicts:
	_admin/index-angular.php
	bower.json
	src/scripts/admin/admin.js
	src/scripts/admin/locationModule.js
eind 16-9