Re #9034 fixing files corrupted by merge
Merge branch 'develop'
Revert "Merge branch 'PredictorAPI' into 'master'"
This reverts merge request !20
Merge branch 'develop' into 'ParserTestingII'
re #8933 Testing LoginParser
re #8933 Testing DataParser, JisParser and WeatherParser
re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse
re #8842 Fixing MergeAttendance
re #8842 Start testing
re #8840 Update commit - start/endTime in method Parse in DataParser can now be null
re #8841 Fixing errors in start/end time and adding interfaces for DataParser and JsonParser
re #8840 Fixing day changes in list of predictions
re #8840 Finishing up Json parser
re #8840 First test
re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.
re #8682 Changed tags
re #8683 Fixing project dependencies problems
Merge branch 'master' into 'ServerParsing'
re #8612 Weather parser in hourly intervals
re #8610 Fixing mistakes in start times
re #8611 Login parser for interval lengths
re #8610 Parsing in stable intervals
re #8610 Parsing in intervals dependand on data
re #8597 Code maintenance - comments, namespace changes
Simple parser - agregates data on "day" granuality
Simple parser - missing comments, code needed asap - minor edit in code
Simple parser - missing comments, code needed asap
Rename