chek
Merge branch 'master' of https://github.com/someatoms/Hage-DAT076
hej
FARLIGT
FARLIGT
fARLIGT igen
Merge branch 'master' of https://github.com/someatoms/Hage-DAT076

Conflicts:
	src/main/java/com/dat076hage/hage/controllers/PostController.java
	src/main/java/com/dat076hage/hage/controllers/UserController.java
	src/main/webapp/bower.json
	src/main/webapp/index.html
	src/main/webapp/js/app.js
	src/main/webapp/js/controllers/PostCtrl.js
	src/main/webapp/js/services/NetworkService.js
	src/main/webapp/partials/post-directive.html
	src/main/webapp/partials/posts.html
	src/main/webapp/partials/profile.html
	src/main/webapp/styles/main.css
sdf
Merge branch 'master' of https://github.com/someatoms/Hage-DAT076
Changed ArrayList to List for the database