Added Answer, Question, Reply and User classes
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/src/cs/ualberta/octoaskt12/Answer.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Question.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Reply.java
Merge pull request #12 from aktse/master

implemented some uml classes
Edited Answer, Question, Reply classes
fixed merge conflict
Merge pull request #13 from aktse/master

passing adapter for ivan to finish'
added new activities and their layouts
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
Kevin/Chris added functions in arraylist, added testcases, added OfflineDataManager class
Merge pull request #14 from creativlimade/master

Kevin/Chris added functions in arraylist, added testcases, added Offline...
modified detail view adapter so now we can call our detail question fragment and get the info of the question. Pair programming Ivan and Aaron
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/src/cs/ualberta/octoaskt12/MainActivity.java
Merge pull request #15 from ibarreto/master

Added adapters and solved conflicts
more pair programming Ivan and Aaron, added another adapter and layouts. App looking cool
Merge pull request #16 from ibarreto/master

more pair programming Ivan and Aaron, added another adapter and layouts....
added a login activity
Added a UserArrayList
added documentation to Question, QuestionArrayList, QuestionsController, Reply and User classes
Added chris' octoask launcher icon
implemented serializable in some classes