unit tests added

karma configuration
unit tests for main.js
controllers ctor adapted
add phantomjs
Merge branch 'datamodel' of https://github.com/Limu123/redidit_ng_2 into datamodel

Conflicts:
package.json
Revert "Merge branch 'datamodel' of https://github.com/Limu123/redidit_ng_2 into datamodel"

This reverts commit ba61ef0f8de2c2570c4ae8070db1b4b88c525e8b.
data model

data model etc
views updated

views synced
show/hide vote up/down

.
post, comments: accounting of comments/votes

show the correct number of comments and votes in posts and comments
add .idea

ignore .idea
Merge branch 'master' of https://github.com/Limu123/redidit_ng_2
Merge branch 'master' into datamodel

Conflicts:
	.gitignore
	app/images/sprite.png
	app/images/sprite.svg
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/auth.js
	app/scripts/controllers/detail.js
	app/scripts/controllers/main.js
	app/scripts/controllers/newpost.js
	app/scripts/directives/picture.js
	app/scripts/services/auth.js
	app/scripts/services/postdata.js
	app/scripts/services/userprofile.js
	app/styles/main.scss
	app/views/detail.html
	app/views/login.html
	app/views/main.html
	app/views/nav.html
	app/views/newpost.html
	app/views/register.html
	app/views/user.html
	package.json
	test/spec/controllers/auth.js
	test/spec/services/auth.js
	test/spec/services/userprofile.js
clean up

clean up after merge
correct vote sum

add vote values instead of counting
user view

clean up user view and data access
fix selected icon

style for selected icon was missing after merge
comment count of post

use available post property
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/detail.js
	app/scripts/controllers/main.js
	app/scripts/controllers/newpost.js
	app/scripts/services/postdata.js
	app/views/detail.html
	app/views/main.html
	app/views/newpost.html
Merge branch 'datamodel'

Conflicts:
	app/styles/main.scss
	app/views/user.html
fix merge

fix merge problems/errors
disable notification (file missing)
additional fixes

information in details
all posts of a user