FAQ module done, prepare merge with master