No significant changes, useless commit
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
not important
Revert "Added toast warning  when adding head comment to favourite list twice"

This reverts commit 62fdb31503e6ead8fbc48f4b87f7192504aceca2.

Conflicts:
	Team10ProjectW2014/bin/Team10ProjectW2014.apk
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java
changes
Revert "Added toast warning  when adding head comment to favourite list twice"

This reverts commit 62fdb31503e6ead8fbc48f4b87f7192504aceca2.

Conflicts:
	Team10ProjectW2014/bin/Team10ProjectW2014.apk
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java
f
Revert "removed faulty stuff from NetworkConnectionModel"

This reverts commit 0d158f6f08eab68033a3c17decb7ba92cac21417.
removed elasticsearch
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
idk
No changes
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/models/NetworkConnectionModel.java
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole

Conflicts:
	Team10ProjectW2014/.classpath
dunno
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Increment favourite count when adding subcomments to favourites
Add ElasticSearch to adding a new head comment
Remove NetworkConnectionModel
Changed userModel back from potential profileModel class