animations
playeranimation & controller
Merge branch 'master' of https://github.com/josbalcaen/BrainsEden

Conflicts:
	brainseden_game/game_files/Library/metadata/00/0007329d7dfefe548ba057f9f4a92537
	brainseden_game/game_files/Library/metadata/07/076ef8f2907527a4c8ef3704bc35b9cd
	brainseden_game/game_files/Library/metadata/08/08e4e7fe43fbd97499e082a2b22e7880
	brainseden_game/game_files/Library/metadata/09/099f6210a234d5245836409ad4bae099
	brainseden_game/game_files/Library/metadata/0b/0b10f2fc63b07124a8bcf11714c99e13
	brainseden_game/game_files/Library/metadata/0f/0fdb222a4cb5e294f9195e6703c4eb97
	brainseden_game/game_files/Library/metadata/16/163aaffa3e6f24d49a0c718e2ef9a442
	brainseden_game/game_files/Library/metadata/16/16bf5636abb12f04cb4e8959b17b4429
	brainseden_game/game_files/Library/metadata/17/1733ba1132273404fb230d957f5a7180
	brainseden_game/game_files/Library/metadata/18/189c91e9e3cda3146b1d4d383dbd71d7
	brainseden_game/game_files/Library/metadata/21/218cb264f125f5c47abbeb1022dfce09
	brainseden_game/game_files/Library/metadata/22/221e100f2dc939943a587c5ad4b84d93
	brainseden_game/game_files/Library/metadata/22/2246db488edb52147a154744e0e97cfd
	brainseden_game/game_files/Library/metadata/24/24896ad2c321c20428e154f5dc46125a
	brainseden_game/game_files/Library/metadata/26/2683ef058580d844498a89c81b16a39b
	brainseden_game/game_files/Library/metadata/2b/2bae378f77d03ef4bbf590609149863a
	brainseden_game/game_files/Library/metadata/2e/2ec6eabc7f800c3409452e7eb8a27f9e
	brainseden_game/game_files/Library/metadata/2f/2fcb6ed0c2f74ef4a85d55958416e08f
	brainseden_game/game_files/Library/metadata/32/32961cc9a016b7d499c899a3069f50e2
	brainseden_game/game_files/Library/metadata/36/367ea82199433da4cb579af2c8af3220
	brainseden_game/game_files/Library/metadata/37/373627f7a7237ff468ad2fe79d5c1113
	brainseden_game/game_files/Library/metadata/39/3930725df80021c468eecf95690f6559
	brainseden_game/game_files/Library/metadata/3b/3bae73f1262033446a2049107b05b040
	brainseden_game/game_files/Library/metadata/3f/3f901377142355141b646c687446362c
	brainseden_game/game_files/Library/metadata/40/406e31f1ad382344eba97df645126a5c
	brainseden_game/game_files/Library/metadata/44/44f86b4fb3096154aba793299d58e0ea
	brainseden_game/game_files/Library/metadata/45/4522f419138032845988de352759f837
	brainseden_game/game_files/Library/metadata/46/465d56b100209df4a89d080ec339abcf
	brainseden_game/game_files/Library/metadata/48/483f30acfc084af41b8b26cd8c2d9258
	brainseden_game/game_files/Library/metadata/4b/4b251c20bb120254ca7054f62af3e39a
	brainseden_game/game_files/Library/metadata/4b/4bb02d334d5f20c498030eee1a716185
	brainseden_game/game_files/Library/metadata/50/502f8fd6d05d5ab4dab59d179ab467a6
	brainseden_game/game_files/Library/metadata/54/54c8d3f788e38a84897c86d73e3575fb
	brainseden_game/game_files/Library/metadata/57/57f3cd480a30e074e8f99b43791fef32
	brainseden_game/game_files/Library/metadata/58/5891934308a0c8845ae5be20a884365f
	brainseden_game/game_files/Library/metadata/5c/5ca54e0868611f048b285b6ecf10ec75
	brainseden_game/game_files/Library/metadata/5d/5d17acc94b282e64a8f0834fd9214c6b
	brainseden_game/game_files/Library/metadata/5d/5d698177834d6074f86012ae25b541b4
	brainseden_game/game_files/Library/metadata/62/625268e3a74e47d4b9be4d306b116317
	brainseden_game/game_files/Library/metadata/62/626e2ae244c266a48a63d424967c9aa0
	brainseden_game/game_files/Library/metadata/65/65ae4340a02a4e04cb665797aefda384
	brainseden_game/game_files/Library/metadata/66/669503351fe837a49adf40b2505bf207
	brainseden_game/game_files/Library/metadata/6a/6a32b7ddf5cc7dd469262aebdfcea363
	brainseden_game/game_files/Library/metadata/6b/6bd09ddd293bbe0438d4b18ea35f2028
	brainseden_game/game_files/Library/metadata/6c/6cff46d0e258aee4cbb7a8df8353ea88
	brainseden_game/game_files/Library/metadata/6e/6e105fbeba91398459f032a7fb0cc700
	brainseden_game/game_files/Library/metadata/6e/6ef4b17147f24194584388456003f306
	brainseden_game/game_files/Library/metadata/70/70bebf6ec265ff64282b4d17023400ee
	brainseden_game/game_files/Library/metadata/73/734bf777c28dc064abc4606a7ad9e9dc
	brainseden_game/game_files/Library/metadata/74/74c31fe0ae5f7264fa2f89dec8ea48de
	brainseden_game/game_files/Library/metadata/74/74d25f5802958da408ab9bad82b58ea0
	brainseden_game/game_files/Library/metadata/79/7939b07f116f3a54ab53944a5a4931c2
	brainseden_game/game_files/Library/metadata/7b/7b457ae61bf8834418d229310f84d8f7
	brainseden_game/game_files/Library/metadata/7c/7cd1d2c8095943347b0d679b5d141d5a
	brainseden_game/game_files/Library/metadata/7d/7d1821cdb8cb5264d94420d186daf7cd
	brainseden_game/game_files/Library/metadata/7e/7e849b97dd565ec47bae8c11c32669c4
	brainseden_game/game_files/Library/metadata/7f/7f0577421a70974479a3fdbb5c312ad3
	brainseden_game/game_files/Library/metadata/84/840669eaaf7203b408602839df5df9ee
	brainseden_game/game_files/Library/metadata/86/8671c7f90450d8d4eaa82b2d41f45917
	brainseden_game/game_files/Library/metadata/91/91dd98a7904c80840bc08c6be6d6e2d5
	brainseden_game/game_files/Library/metadata/9a/9a3ec5b901bd3fe408f377002dc57850
	brainseden_game/game_files/Library/metadata/9e/9e0508e996709ae4ab3816abb14b70e6
	brainseden_game/game_files/Library/metadata/9e/9e2213d976ef6004ca40fd3bac784748
	brainseden_game/game_files/Library/metadata/a2/a279a8d67b5d4e04b8c2e7679a18f6b7
	brainseden_game/game_files/Library/metadata/a2/a2c42f08f9b7c11499258704f39719a8
	brainseden_game/game_files/Library/metadata/ab/abb899fc7a130bd44ba442bb8848414c
	brainseden_game/game_files/Library/metadata/b1/b144c289f4f3ea14dbbb858ad4855a31
	brainseden_game/game_files/Library/metadata/b2/b2e903b7a3461c54caf6fb8e51b2e2e0
	brainseden_game/game_files/Library/metadata/bd/bd7bb1a7124ca6647966a4bb546d1f5b
	brainseden_game/game_files/Library/metadata/c2/c243fc1461b55714db9b5eb80b355ab2
	brainseden_game/game_files/Library/metadata/c3/c34b764a9da634643be051121e313db3
	brainseden_game/game_files/Library/metadata/c7/c727a476c81c4cf4d90e4f82ff9bf5e9
	brainseden_game/game_files/Library/metadata/cc/cc49465354df3d14bb0736969220d366
	brainseden_game/game_files/Library/metadata/cd/cd44d81ec052c0041a323c5a39a5d881
	brainseden_game/game_files/Library/metadata/cf/cf58b5f7c9f060e489de1db2847c948a
	brainseden_game/game_files/Library/metadata/d0/d065ad55df1b41c4693d9cb25fcf8dad
	brainseden_game/game_files/Library/metadata/d4/d414d0f35c993ac4d8f8a3c18e8d63d9
	brainseden_game/game_files/Library/metadata/d5/d5587d5776a7a4e4a815cae4e6753316
	brainseden_game/game_files/Library/metadata/d9/d9223c12b45c7074e8aeba319125e089
	brainseden_game/game_files/Library/metadata/da/da07d02bf9583b541b209973d4fafa92
	brainseden_game/game_files/Library/metadata/dc/dc4975058b7d8234ab5d798618de1399
	brainseden_game/game_files/Library/metadata/dc/dcbbcd8688458544c95517af9e2a84f0
	brainseden_game/game_files/Library/metadata/dd/dd9d5581eb4ad674dbcc87abc5f770c3
	brainseden_game/game_files/Library/metadata/df/dfa8e0cb39ebc444f9aca4e2906d0adc
	brainseden_game/game_files/Library/metadata/df/dff69277eef48e14aa4f747709f34a58
	brainseden_game/game_files/Library/metadata/e3/e3e00329465223e4bb7b5050910d14cc
	brainseden_game/game_files/Library/metadata/e5/e5863acd0073a64439e009aa3ec74ef6
	brainseden_game/game_files/Library/metadata/e8/e848c7eb5c6c1fd498c9203f6d57e474
	brainseden_game/game_files/Library/metadata/eb/eb032280b304b624f983a01bd176f405
	brainseden_game/game_files/Library/metadata/eb/eb1c6099fbee266418b87dc96f839801
	brainseden_game/game_files/Library/metadata/eb/eb5aa94be56130249bf9378083eddde1
	brainseden_game/game_files/Library/metadata/ed/edc769b6a5bd82543b49d32a0a97c3bb
	brainseden_game/game_files/Library/metadata/ef/ef3e86c5d3045eb4e8e0a126672dbe39
	brainseden_game/game_files/Library/metadata/f1/f1407d775123fdb4c9cdc28d133eff5b
	brainseden_game/game_files/Library/metadata/f6/f606a266276657045b1223cb46e3ed40
	brainseden_game/game_files/Library/metadata/f7/f7b9497e54e0d0941b9f06c84b082c7f
	brainseden_game/game_files/Library/metadata/f9/f96e2f5c1be45e54c86fe1d5b63355a2
	brainseden_game/game_files/Library/metadata/fb/fb805f4ef732e24418c53b06ffba81d8
	brainseden_game/game_files/Library/metadata/fb/fbdde025f94786947a12ebfa24625f45