a
Merge branch 'development' of https://github.com/bs87/projektmanagement into development

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	log/development.log
	tmp/cache/assets/development/sprockets/027801f1860023b60dbb4a00a9223869
	tmp/cache/assets/development/sprockets/08efc4a9d0b32919dc2483d8c05754ce
	tmp/cache/assets/development/sprockets/10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/development/sprockets/11c1306b10b15e8d8986a74444bfba40
	tmp/cache/assets/development/sprockets/11e5f0e44b87a4019cd38a0f2c195bf4
	tmp/cache/assets/development/sprockets/137efabe9c1e6de3221bc9981e7261c9
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/170dd518180c7e9753558777b5a4877f
	tmp/cache/assets/development/sprockets/18de759385be989a5f0d911ce53b56ce
	tmp/cache/assets/development/sprockets/195d2342f8b55648d56956596824ebb9
	tmp/cache/assets/development/sprockets/22a3157d204c1f8e417a25f01a2dbe45
	tmp/cache/assets/development/sprockets/29c2f0fd8e3c5f4dcd1332efa4a0371d
	tmp/cache/assets/development/sprockets/2c0b2f98a975be143d57fce703d4650f
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/39f6ce3da2c49d303f6f116ec22f43ad
	tmp/cache/assets/development/sprockets/4279bbd68dddbe88f97c6a07707f8fd7
	tmp/cache/assets/development/sprockets/42b21de16e660a11693438aef0ae272b
	tmp/cache/assets/development/sprockets/478e77fea852d85e9497ad17ce0c52de
	tmp/cache/assets/development/sprockets/4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/development/sprockets/55bbb1476e44b8539b71549eb2c3bab3
	tmp/cache/assets/development/sprockets/574970e6e50e06b95b05eb0e7d5d4d2e
	tmp/cache/assets/development/sprockets/5895c7c5e1411c4b3182851757cd1de8
	tmp/cache/assets/development/sprockets/5897e854e7bbaf94e4dbed20ec081f76
	tmp/cache/assets/development/sprockets/5e30a6b911437f1428dc32c3ae182123
	tmp/cache/assets/development/sprockets/5ec2aeeb0ad4ad9c11506c6e49b38b01
	tmp/cache/assets/development/sprockets/615f7846ab9ec4cb7a1b0d18a0460998
	tmp/cache/assets/development/sprockets/63819ef929ec489ffa35d3b520d2788b
	tmp/cache/assets/development/sprockets/6654975eaa53a225d976278fcb6baa00
	tmp/cache/assets/development/sprockets/6734faf8f3ee6d939bea4034fa3c2a6d
	tmp/cache/assets/development/sprockets/6782ceae1f66978587ccfa5a92425df8
	tmp/cache/assets/development/sprockets/698c4f478493aa93e94a2c32cdd5f1cc
	tmp/cache/assets/development/sprockets/6c0f2a2c7346b84a92e2cb81473e251b
	tmp/cache/assets/development/sprockets/6f12d85ae1ff20a235b68e3dd9936c9b
	tmp/cache/assets/development/sprockets/6fad04bfc6f657170023030f3a905cfd
	tmp/cache/assets/development/sprockets/7343d489640efa4c4c92c394dcceb695
	tmp/cache/assets/development/sprockets/773808e96320f3c9001f63970548d3ec
	tmp/cache/assets/development/sprockets/779fd39741d5f4364f4453e6d9db3a8c
	tmp/cache/assets/development/sprockets/7917f2a4116ef6ff536467ff9811b2d2
	tmp/cache/assets/development/sprockets/7d11599609c695eac86b604c324d89eb
	tmp/cache/assets/development/sprockets/7fe72ac1c0db1a7e8e7f59cf25e8a39e
	tmp/cache/assets/development/sprockets/82b37ae9eccec44c1ef44cfdd07d8534
	tmp/cache/assets/development/sprockets/833fa0f8ca6eda2934d5875796ac0ddb
	tmp/cache/assets/development/sprockets/85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/development/sprockets/87650fd3903b64a8b6a27f3bbf639b50
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/95b34553833c1aa34842c0cb0666f9a6
	tmp/cache/assets/development/sprockets/977ead1d20bc9f7e1c191bd4348f9e3a
	tmp/cache/assets/development/sprockets/981fdf59c6c819da5a85424ee749e704
	tmp/cache/assets/development/sprockets/9a038be696cbcf0834d1639950b1946b
	tmp/cache/assets/development/sprockets/9bb24378099f9875267068b5dd0a1fdf
	tmp/cache/assets/development/sprockets/9c590f6bbeb303d9db4565da7b8914cb
	tmp/cache/assets/development/sprockets/9ca51bbbb4d99ab79ea67e92440e9fb5
	tmp/cache/assets/development/sprockets/a31c1ca68db4eba27bef92febe012e31
	tmp/cache/assets/development/sprockets/a5b779be5a68643653ca723bce23c62c
	tmp/cache/assets/development/sprockets/aae47a7dd7116d2f493959edc0ac981a
	tmp/cache/assets/development/sprockets/ae51d79f7255745e47095614074601b6
	tmp/cache/assets/development/sprockets/af1cc58bf9bdecc99858876e2686ec56
	tmp/cache/assets/development/sprockets/b6e3cdfe7a8d4937faef37edd874dec1
	tmp/cache/assets/development/sprockets/b7fc7a50cc3464d16f378714639f14e2
	tmp/cache/assets/development/sprockets/b95ea15c787fc6a02ba8ece2451123de
	tmp/cache/assets/development/sprockets/ba0534eedd2ee62bad4e6c41b311dbde
	tmp/cache/assets/development/sprockets/bd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/development/sprockets/c3df230332011114929a1a92fb70873f
	tmp/cache/assets/development/sprockets/c4907ce407d3dcd3849a2707ad08ad11
	tmp/cache/assets/development/sprockets/c650bc0d01c9e52b09d3ac20cf174088
	tmp/cache/assets/development/sprockets/c672ae7a0ce11b05e375fc0a927e6f90
	tmp/cache/assets/development/sprockets/c76169fba81df6df98cb06b0f4865c79
	tmp/cache/assets/development/sprockets/cb201f9af856ac9bbd22192917f58f58
	tmp/cache/assets/development/sprockets/cb3e65e5d4fc8aec86c1f7bd831209ad
	tmp/cache/assets/development/sprockets/cc1ffaac4063f53e674de93611e89494
	tmp/cache/assets/development/sprockets/cc400c70d4640f0214780570054e21e7
	tmp/cache/assets/development/sprockets/cd8e5b316c90983e2bdb47613c7beab4
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/d85a9432d4f90bdb4de3337a6a35098f
	tmp/cache/assets/development/sprockets/e185d630f84ab364288192ea99e5c55a
	tmp/cache/assets/development/sprockets/e2e8f7f4c2e46b20bbaa95d67e83c41e
	tmp/cache/assets/development/sprockets/e34a8e6a515356ee24ba6607ebe05f03
	tmp/cache/assets/development/sprockets/e459168835a5f27b832ace20874f7c10
	tmp/cache/assets/development/sprockets/e7222837b0a44b73877059cc36e15f96
	tmp/cache/assets/development/sprockets/e948807e44a52fc71ac722b8aca1ca09
	tmp/cache/assets/development/sprockets/e9ad2bdb5ac7446daafbde22298c41cf
	tmp/cache/assets/development/sprockets/ed67777076cfbbf0b6a07049b148226f
	tmp/cache/assets/development/sprockets/f0c2e6ab6e98cb291a25a7e1b0daaa58
	tmp/cache/assets/development/sprockets/f2abf8f79422cbd3c904ab279ea163a8
	tmp/cache/assets/development/sprockets/f35e4e0a4454f5bd7725a691d85185fb
	tmp/cache/assets/development/sprockets/f3883eb6b81c90c7409aeb8a2e2454bc
	tmp/cache/assets/development/sprockets/f391b64235b7ad17b81ab7754710ea1d
	tmp/cache/assets/development/sprockets/f4cbae1f01c3ad2552a8f90c89ac286b
	tmp/cache/assets/development/sprockets/f7816cd25f2cbf78a9ea11708a70c006
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/fb2c449fd65a421ab0343a2ec3358f14
	tmp/cache/assets/development/sprockets/fbd2c68907e76203604f3f7b27f442ca
	tmp/cache/assets/development/sprockets/fde3d3c8658f07dd5aef16cc104c05c9